From 5deb88b1a9fd047b8b2c34e056845da908094bff Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Sun, 27 Feb 2005 13:49:07 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.36 (4221cfd30UrMyu3TpXKGjVNXNVS1Bw) Update 'xen version' in guest-OS images to 3.0. Signed-off-by: Keir Fraser --- extras/mini-os/x86_32.S | 2 +- extras/mini-os/x86_64.S | 2 +- linux-2.4.29-xen-sparse/arch/xen/kernel/head.S | 2 +- linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S | 2 +- netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S | 2 +- tools/libxc/xc_linux_build.c | 2 +- xen/common/elf.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extras/mini-os/x86_32.S b/extras/mini-os/x86_32.S index d193b121bd..c02048f9a0 100644 --- a/extras/mini-os/x86_32.S +++ b/extras/mini-os/x86_32.S @@ -1,7 +1,7 @@ #include .section __xen_guest - .asciz "XEN_VER=2.0,LOADER=generic,PT_MODE_WRITABLE" + .asciz "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE" .text .globl _start, shared_info diff --git a/extras/mini-os/x86_64.S b/extras/mini-os/x86_64.S index 0f37d596f7..d5cf9badd7 100644 --- a/extras/mini-os/x86_64.S +++ b/extras/mini-os/x86_64.S @@ -1,7 +1,7 @@ #include .section __xen_guest - .asciz "XEN_VER=2.0,LOADER=generic,PT_MODE_WRITABLE" + .asciz "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE" .text #define ENTRY(X) .globl X ; X : diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S b/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S index d48bb7098d..cda41ae56c 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S +++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S @@ -1,6 +1,6 @@ .section __xen_guest - .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=2.0,VIRT_BASE=0xC0000000" + .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=3.0,VIRT_BASE=0xC0000000" .text #include diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S index 3d2d8947a4..8b998ea003 100644 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S @@ -2,7 +2,7 @@ #include .section __xen_guest - .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0,VIRT_BASE=0xC0000000" + .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xC0000000" .ascii ",LOADER=generic" .ascii ",PT_MODE_WRITABLE" .byte 0 diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S index ed0946cb9b..a8967d75cb 100644 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S @@ -180,7 +180,7 @@ * Xen guest identifier and loader selection */ .section __xen_guest - .ascii "GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=2.0" + .ascii "GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=3.0" .ascii ",LOADER=generic" #if (NKSYMS || defined(DDB) || defined(LKM)) && !defined(SYMTAB_SPACE) .ascii ",BSD_SYMTAB" diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 12753b78a6..8f7a979d75 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -538,7 +538,7 @@ static int parseelfimage(char *elfbase, return -EINVAL; } - if ( (strstr(guestinfo, "XEN_VER=2.0") == NULL) ) + if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) ) { ERROR("Will only load images built for Xen v2.0"); ERROR("Actually saw: '%s'", guestinfo); diff --git a/xen/common/elf.c b/xen/common/elf.c index 75ab4da4de..38cbb30db0 100644 --- a/xen/common/elf.c +++ b/xen/common/elf.c @@ -76,7 +76,7 @@ int parseelfimage(char *elfbase, return -EINVAL; } - if ( (strstr(guestinfo, "XEN_VER=2.0") == NULL) ) + if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) ) { printk("ERROR: Xen will only load images built for Xen v2.0\n"); return -EINVAL; -- 2.30.2